Reformat code done. Added executor stuff to domain layer.