Justin's recommended refactors.