Formatted and sorted attributes to make accounts easier to scan through
Small cleanups