-Fix: Fix coding style issues from previous commits