Apply suggestions from code review

Co-authored-by: Aris Cahyadi Risdianto <[email protected]>

Author: sumodirjo