Refactoring
Clean up