updated formatting, some reorganization