* Removed parameter for 'this' reference since it isn't needed (just use .bind(this) instead
* Cleaned up code