improve the api a bit
formatting