cleaning the code (KDPApi + comments)