CODE: Code cleanup