Cleanup on Classes

Unnecessaries variables on the Classes.
Learning OO with Python :P