Clean up most of the linter warnings/errors
Debugging issues which mostly came from the client