code cleanup on whole project