refactor and clean code: standards..