Minor changes, cleanup