small refactors
hlinted