Added refactoring comments - PARAMETRIZE

These comment are intended to help with further refactoring/extending ...