More prettification/linting