Removing log statements, small refactor