Cleaning up and adjustment
Cleaning up and adjustment