Code Cleanup

Removed the driver, console statements, & hard coded values.