Refactor tweaks

Just a few small refactor tweaks :+1: