simplify logging
fix
rename