Tidy up some small parts that were confusing a new user