Normalizing some methods, cleaning old stuff