Some updates and clean