Refactor: fixed more "magic numbers"