[More small refactors]