Modify: Code cleanup