linting and cleanup, take 1