* Also some code clean-up and comments while I'm in there * Added space after CSS property colons. * Add return types. * Reformatted code. Change-Id: Ieea24d52b974d1e3c18c34ee30535577b02f738a