Tweak coding style