Some formatting and general changes