Add rail-line and rail-node form, delete trailing whitespace