Cleaning the code and renaming Engine variables with more significant words