Fix jsHint
Apply feedback from PO