linting and general code cleanup before trying to figure it out