Refactoring

better code reading