1. More checks for existence of files
2. Prettier printing