clean up, rename some methods