CodeSniffer Fixes - Fixed Issue #283