Arrange constants, removed unused