Coding style now better