Cleaned up TABs and indenting