tweaky tweaks
refactoring ...