Code tidyup to get to standard layout