Cleanup variable declarations, documentation and whitespaces

Change-Id: I8a771e907898a74444e95377deeef60380733bbc