Title, small refactors