More lovely code cleanup (I do this way too much, sorry...)