Cut down on some code bloat