remove unecessary nulling, change comment style