clean up code + part of function names (camel Cases inc)