Make it simpler