refactor all the things 'cause I felt bad