Round one of spi checkstyle compliance