Cleaning up a lil