improve - variable and funciton names
improve - consistent class section layout