Fixing indentation and removing some extra commas