Added Logging.h to project for trace logging purposes which makes development easier. Minor code cleanup.