Added a little more organization, made sections
easier to jump too