cleaning

-deleted old, already commented out, code
-indentation correction
-multi-line code either corrected to one line or organized better
(indentation)
-more figuring out what stuff was doing