Refactoring and rownames added