clean some stuff, start transition to camel case, ...
continue transiton to camel case