little lint and refactor