Cleaning code, and more...