Belman - Refactoring