UX improvements
JSHint improvements