Base class created
Little cleaning