Some clean up/