Quick refactorings

Just some easy refactoring to help with legibility