First commit - changed parameter to self regarding best practices