Fix details & improvment of code source