cleanup
constant for api version
adding comments