Address code review comments for tabs/spaces