Some formatting + Reworked some of the threading model