Defined more constants, formatting