Fix code style / comments