consolidated elb registration. Whitespace cleanup