Some refactoring
Fixed Logger Messages