Revert "Update - code cleanup, reduce the length to under 80"

This reverts commit dccd9d2300cfc957a3a80099fbe7989216f40cde.
Revert "Update for displaying the primary section at the top of the list and code some cleanup"

This reverts commit f6d0a53cf7862a115fcbe5c3fe8b4321c6f33ed6.