Refactore to make development better