Tidying up code style