Form:  Update variable names
Factoring:  Remove unecessary files and update variable names.