refactored to some readable state