Refactored Program