Refactoring stuff...

VIVA LA REVOLUTION!!!