Format and move some definitions