Minor refactoring
* removed unnecessary comments
* renamed "list"
* removed unnecessary imports
* and so on