Extracted class to maintain Single Responsibility

[HandsomeCoder]

To retain the Single Responsibility, a few fields and methods were extracted from the class.