fixed typo
fixed whitespaces and logger getting
fixed typo
more logger, whitespace fixes
some refactoring and renaming