refactored code
initial commit