Enhanced Analytics Code

Moved the `if statement` to its own section to make it easier to read
Merge pull request #3 from FRC-1294/develop

Enhanced Analytics Code