refactor
fixes