Cleaning up mess with tabs & spaces
Removed redundant directives
Git checkout is handled by ant