some code cleanup + stale badge fixed