fix up the code a bit