cleaner todo with better rivets