REL: Code clean up