Revises format elements; Rewrites tests and data