Refactored some files I forgot about