Slight cleanup
Code reduction.