Make API more readable

Still not good though