Reorgamized a bit