[Minor] Minor refactoring + removed unneeded comments left from earlier refactoring