More semantic coding style