Remove extra space only; fix
Better logs with level checking; fix