Cleaned up some code. Added Commons Logging.