Cleaned Up Code

Commented unnecessary stuff, replaced encoder with second Analog Channel