Updated the readme to conform to v2, also using a few constants