-code cleanup