Refactoring

Removed the use of classes