start to cleanup api a little bit