Resolved CodeSniffer Issues