Client-side: Improved for JSHint