Refactor lint