re-visit project to clean it up