cleaning up, simplifying