clean up and spacing