Little bit of simplification and cleaning-up