Private variables' names changes and other optimizations