Renamed private optimization classes.
Cleaning console output.