cleaned up API a bit