Dropping utc (we don't use it after the constructor), few other minor tweaks.