More code Simplification