Remove trailing comma.
Remove explicit variable declaration as its done by cs anyhow.
Minor tweaks.