Code Cleanup - alignment, braces and removing unused code.