Rearrange file to comply with JSLint