updated to ignore OS X's .DS_Store files
simple renaming and style stuff
simple renaming and style stuff