Code Simplify