Clean up code and naming
Fix typo in github link