Adjust the Driver

Change the design of the driver for a cleaner output
Merge pull request #4 from aedwardsxula/Nikita

Adjust the Driver