Merge "Remove code smells in dashboard"