cleanup / basic refactoring (naming conventions)