Remove trailing comma
Fix typo
Remove extra spaces
Merge pull request #1202 from kumabotz/minor-cleanup

Minor cleanup