-Code cleanup