(Code cleanup)