cleanup
simplifying a bit