Fixed and standardized the formatting across the entire application. Going with standard java convention for the most part.

Change-Id: I940a7358b5ff53e1bd6331f7a5a3186dd694852a