Fix Github link
Code cleanup