Cleaned within the files

Removed some automated comments, added some personal comments, and made
the overall structure of the code more easily understandable and
readable.

Also, some test-files have been removed.