Refactored more.  Made note of lines in NEED of review (4)