NXJS-10: Format & cleanup