Fix function naming conventions, comments and whitespace

* Convert some spaces to tabs
* Move private function to top and document
* Give constructor a global name

Change-Id: I7ec144303d32b1bb454b4164222601c263fb75bf
Merge "Fix function naming conventions, comments and whitespace"