Defined and moved some constants around