cleaning up the code a little