Move logger into main file, message fixing