One line if refactor and more ol_logging