Improve and clean