Added some changes to the documentation; Renamed constants to suit naming conventions