more clean up and prettifying