used slf4j logging and cleaned up