Removed magic constants
Changed README