Anand - some simple cleanup
Anand - added log4j library and replaced all System.out with appropriate logger statements