Updated for simplicity

Trying to make code easier to understand.