Feedback2

Nice job! I went through a few refactorings which are in the commits listed below. You can go through each one and read the associated commit message for more details about what I was thinking.

As always, please submit a help request if you have any questions about any of these changes.