formatting update, should be consistent now.