Quick tidy up and get things working