CHORE: Some more code refactorings