Tweak readme
Remove magic values in service class

Also add comments.