Refactoring and move little forward