Remove unsed code + fix coding style