Better formatting
Cleaning
More cleanup