Linted and cleaned up code.