Refactored some refactor things