Code has been refactored