Improve organization & small fixes