Significant style changes and streamlining