Clean up codes, fix long lines, improve readability, etc

Update copyright date, remove unused variable, import

Change-Id: I731c48c8e5b16cbee5230f1d02109f249b8bab5d
6 files changed