Refactoring, change some names and comment