WPCS Cleanup

Removed trailing whitespace and other WPCS issues. Also Fixes #15