Removing log and having better exports
Refactoring