Fixed constructor call.
Convention compliance improvements.