Fix code style and lint erros