* Tidy up of code