STYLE: fix styling issue
STYLE: Fix cases