Minor cleanup, saves a few bytes yay