Some more OCD refactor