yolo
some refactor