Made indentation consistent (tabs), stripped extra empty lines and eol whitespace, made if-spacing consistent
Merge pull request #1 from Aldone/cleanup

Some cleaning up before more serious updates