.DS_Store files removed & code style fixes