Some code simplification.