refactor
improving code quality