Refactoring

because Tenker hates it when I don't fix my code at his convenience.