Character generation cleanup, and other stuffs

Just read the flipping’ title