Code changes and formatting
removed all high level violations, and properly formatted code according to agreed upon standards

Change-Id: I3cb818761314a46c12d5596b08991541d095db38