More Style Issue Fixes