Remove DS_Stores
Move fields to top of class body