Removed unneeded ifs.
Several useless changes.
More logic.
Less classes, more logic.
Merge pull request #2 from Penguinum/moreoop

Moreoop