Refactoring
Split up methods, generalized Logger, removed TODOs