Clean up

renaming variable, removing out-commented code, adding comments