Just some minor changes. Like removing log4j dependency