clean initializer, add storage