Lint/Style cleanup