files to be code reviewed

Review and commit these files for code styling and logics.