Make JSHint happy
Improve code reading