Began refactoring with IDEA. Started to replace println with logger calls.