Credits and comments added
Code cleanup
Test for multi driver