Cleaned up lint

Lint fixes