Well most of the code is looks good and proper to me. As you strongly recommend keep it like this. I am OK for this as it will hot cause problems. We may can discuss and improve it later.