Fix graph building
Style fixes