Remove useless code + adjust minor style