Separate existence checks and warnings
Integrate new changes with `tidy' syntax