cleaned up some linting errors and respected 80 col