Style fix
Striped down NTuplerMaker
Striped down NtuplerMaker [2]