Remove unnecessary instance variables

* Better follow Sandi Metz's rules