Cleaned up.
Added before save callbacks