Just Cleaning The Code