refactored somemore code