Some more coding style