refactored alittle