tidied up code_cleaner