refactor, div. fixes