Refactor
Mass refactor