correcting cosmetic issues and unused imports criticized by landscape