Better use of enums & magic numbers