Further post improvements.
Post cleanup.