Slight cleanup of 'Macaw Bros' theme