Fix conventions, log messages