cleaned up spacing & made files neat