cleaning up majority of lint warnings and errors