Minor changes, formatting