Refactor

* Fixing indentation
* Removing unneeded calls