refactored, removed unnecessary @estimate_status, which made the code wordy
making everything line up
making everything line up, and tests all pass