Improvement in the organization

Small changes in indentations and variable names
I changed the function `scroll` by function `on`