REF: simplified code