hide some methods, clean up