Some cleanup of the code
Auto-format