Github badge, change account link and some code cleanup