Code cleaned + refactoring