some cleanup as I wont be able to work on this again