Improving linting options and cleaning up