Just some code tidying