Refactor for style

* Remove redundant "self." calls

* Remove extraneous lines

* Remove redundant assignments