Give the code a quick cleanup
do some more cleaning