Fix typescript conventions