cleaning up the code; a lot of long variable's name has been reduced