Merge "Fixing formatting, removing tabs"