Clean comment and make some implementations