Minor formatting changes

+ addition of some constants to be used in future