Tidy up of code