changed variable names, commenting layout