Cleanup and lint
added badge