Cleaning up the bars and names