Code Cleanups and Debug logging Messaged added
* log4j is now used