More Clear up & simplify