Minor format fixed. Some encapsulation to do