Cleanup (warnings; formatting)