Removed the class for feature choice.
Removed a comment.
Does not use a specific number of attributes anymore.
Bugfix, code switched between two functions.
Refactored to not use feature selector, and also general cleanup.