Slight refactor, lol