Clean up plus need that stupid polymorphisis thingy