Minor code cleanup, switch to slf4j