Tidy/Refactor

Largely housekeeping. A smidge of optimization and now sizes the field
to the window if you reset.