Cleanup; API consistency