Finished editing after Sandy's suggestions