Better coding style now