fixed up the code a little bit