minor debug loggs
refactor