clean up the code a little