refactoring code
merging files