Main class cleanup + Changed custom stance handling