Recommendations

based on Lint