Major Cleanup/Lint.