Arrange includes and remove an unneccessary variable