Refactoring (Remove Sysout, Change to logger)