after Lint clean-up, and settings all implemented