fixes based on feedback (rename classes, fix indents, remove 'this.')