Formatting
Clean some reported bugs
Formatting