Clean up formatting and wording. Final version for Spring 2015?