Clean up to generalise