cleanup console + function names