code cleanup before working on filtering