Import clean up
Semicolons are not necessary
Simplify authorization fields getter
Merge branch 'cleanup'