API change, clean up + code comments (more to come)