Clean up whitespace, `this` and use of $ global