Reorganize things
Modify a little things