Add recomendations. Code refactoring