Minor formatting changes to code

Added some comment headers to the code, cleaned a few things up
- Remove 'grandma mode' references in code (WHY WOULD YOU MERGE THAT
BLAISE!?)