Major Fixes for Reindentation, Use Clauses Ordering and semi-colons in FOR loops

Also some code groomin