cleaning up the code a little bit