Earlier work
Relocate variables
Clean up comments