Some minor changes, formatting