Edit DOC + Clean code