linted and cleaned up