Olga is changing some constants

Made some comments, improrves readability.