Improve js readability