code cleanup/optimization