FIX issues in code review
CLEAN factorized code