Code clean ** refactoring