Working tweaks
refactor and coverage