Refactoring

Ready to release