Refactorings & simplifications