Changed finals to consts