Fix warning messages and remove redundant variables

[Tanryberdi]

We need to keep clean for our implementations, so need to fix warning messages and remove some redundant variables

[samjtro]

I merged these changes as part of #9 - I will make a new issue that perpetually tracks redundancy, error messages & warnings. I'll assign the both of us to it.

Thanks for all the help as of late!