Some refactoring and stuff?