Method order changed

More organized
Commented code removed