Refactor more things