Cleaned up some code

Cleaned up some of the code, left code snippets that we had as ideas but
never did anything with, put work in progress or Currently not in use if
such was the case.
Commentary

Sorted out comments for what looks like most of it