Some refactoring suggestions 

Hi Alex,

Here are some refactoring suggestions.  We can go through them tomorrow.

We can also work on the order of operations fn, or whatever you would like.