I agree. Honestly, I kinda went back and forth to decide this way or what you suggested and really couldn't make up my mind. I went with this for developer convenience but I see that making it kind of vulnerable for bugs is not worth it. Updating it.