Clean and refactoring of code
Clean up and refactoring