wrapped up the code a bit