Updated flatten, 'Get' by contains, cleaning up