Refactored to reduce code in main function. Preserved passing unit and functional tests for complete stories one and two
Updated redraw method for clarity