major-ish changes and formatting