Tommy Leedberg - Cleaning up some stuff for assignment9