Clean up

- clean up codes