Fix codesniffer complaints

Fixes #3