massive styling and formatting update