Cleaning up sloppy writing