Cleaned up Lint issues