cleanup and refactoring
readme