Small refactoring and adjustments
Use numbers instead of strings