Changing the a badge on readme
Minor CS refactoring