Add new code and clean