better names, some cleanup