Emily and will's refactors!

This is all pretty basic stuff, and a lot of it is based on personal preference.  So up to you guys whether to pull.