changed variable names, class fields, layout