Fixed style issues

Change-Id: Id5b676375c07b13778cb39789180064317dc1c7c
Fixed various lighting and formatting issues

Change-Id: I7c13ad6ec781c46fe4ef239fe439c0721a1e6068