Make some cleanup on the main

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Related tickets | #26
| License       | GNU GPLv3

- [x] Fixed some bugs ([ref](https://ci.appveyor.com/project/alquerci/cyg-apt/build/1.0.203))