Style updates
Style fixes, code cleanup
Remove DS_Store