Better name for method
Refactor stuff
Previous commit was buggy...
Align variable names
Align variable names