Making this a little bit more concise

Didn't mean to do all that reverting