Code style (better?)