major style changes and updates