Cleaning & Codestyle.