Cleaning and new features