Shortening some lines
Switching to more graceful match
Change from section to group, removed unneeded functionality