Cleaning and refactoring before releasing.