updates:

1. renamed one file based on existing naming convention.
2. clean up codes.