Revert 1e06910..62884b0

This rolls back to commit 1e06910061ee39641c689786e8c369debbca86cd.
Revert 62884b0..fb56520

This rolls back to commit 62884b0cd55f2ef869cacedde212c3b5c759fc7f.
Modified code to adhere to code standards