Refactoring
Experimenting with script constants (diff with previous commit)
Refactoring
Refactoring
Refactoring