demo-import: refactored and removed comments of project3