code cleanup, non uppercase varnames