Rearranged methods under class

Added most of the methods under the class to enhance
the design of the generator. Reduced ammount of repeated
code to embrace DRY methodology.