Formatting fixes
This project has no standard for space vs tab usage at all. Expect fixes