cleaned up some files, fixed spacing of tabs