cleanup and comments in CoreObject