Cleanup (pointless exceptions; field extracted; formatting)