PLS STOP IT, refactored code