Remove swap file
Remove old result file
Add ISO comments
Improve generator