data and code cleanup