we began to make code simple