Code tidy and linting