Improve(?) save method.

Not sure if this is worth the added complexity?