Fixed issues with tab vs spaces for formatting