CODE: code cleanup