Springified and cleaned up a bit.