Changing some variables names, fixing consts bug in the main program and changing some methods names