-- code cleanup