Little refactoring of logger and build scripts