Logger Added
Some code clean up