Delete funcall and use normal function form instead
Delete useless condtions
Add comment about newline