Cleaning
Code formatting