cleaning up
succinctifying