Formatting fixes
Better git ignore