Minor changes, some cleanup