More cleaning, rename some methods