Cleaning up

Cleaning up the codes.