Updating to spring 2014 and removing whitespace