* Code cleanup
* Check for existing files