Updated and clean code in few libraries