Small code tweaking

For simplicity.