Fix inconsistent indention + replaced $this->EE with ee()

The commits should be descriptive enough :)