comments and cleanup in macropy/core