Make API more idiomatic
Comments + Cleanup