Organizing code

Shifted couple function definitions for readability., commented out
Cleaner.