Tidying some code.