Code neatness and commenting