Code cleanup

Cleaned up linting errors.