Cleaning up formatting issues found here http://ventral.org/pareview/httpgitdrupalorgsandboxbalsama1929616git (2)