Linted and cleaned up a bit