More code tidying and conversion