Recommendations

based on Spring Cleanup