Cleanup and minor API improvements