Added package description
Refactoring