Added Logger module
cosmetic changes