cleaned up code in investmentrole