tidy; General tidying of code.