cleanup, rename methods, remove unused methods