Simplyfy the code
Update the simplifying code