small cleanup
refactor
minor fixes