clean up, add public