Spring 2014 Cleanup!

More in line with coding style.