Simplifications

Simple simplifications to existing code (and thus no tests)