Cleanup (common method; pointless assertion; formatting)