Changed badge color to blue and some code cleanup