first round of cleanup
remove model window and cleanup
variable names cleanup