Fix lint and respond to comments