Decoupled unit factory from army and fixed up some style issues