BOOK-562 cleaned code and added api urls