cleaning up and maintaining formatting