Various reworks/rebalances I would make (Will make a second version later; open to feedback)