More code linting/general cleanup.