Fix code style and naming