Some little changes (remove unused code, rename methods)