Fix and clean up styles
Update tests
Fix more tests
Merge pull request #1239 from kyungmin/clean-up

Fix and clean up styles