Slight refactor

Not sure how i feel about this, feels a little messier.