diff --git a/api/mraa/spi.h b/api/mraa/spi.h
index 3530ebd..bd4e31b 100644
--- a/api/mraa/spi.h
+++ b/api/mraa/spi.h
@@ -84,7 +84,7 @@ mraa_spi_context mraa_spi_init_raw(unsigned int bus, unsigned int cs);
  *
  * @param dev The Spi context
  * @param mode The SPI mode, See Linux spidev
- * @return Spi context or NULL
+ * @return Result of operation
  */
 mraa_result_t mraa_spi_mode(mraa_spi_context dev, mraa_spi_mode_t mode);
 
@@ -92,7 +92,7 @@ mraa_result_t mraa_spi_mode(mraa_spi_context dev, mraa_spi_mode_t mode);
  *
  * @param dev the Spi context
  * @param hz the frequency in hz
- * @return mraa_spi_context The returned initialised SPI context
+ * @return Result of operation
  */
 mraa_result_t mraa_spi_frequency(mraa_spi_context dev, int hz);
 
diff --git a/src/spi/spi.c b/src/spi/spi.c
index 4d9e2b0..6315395 100644
--- a/src/spi/spi.c
+++ b/src/spi/spi.c
@@ -147,17 +147,17 @@ mraa_spi_init_raw(unsigned int bus, unsigned int cs)
     if (mraa_spi_mode(dev, MRAA_SPI_MODE0) != MRAA_SUCCESS) {
         free(dev);
         return NULL;
-    };
+    }
 
     if (mraa_spi_lsbmode(dev, 0) != MRAA_SUCCESS) {
         free(dev);
         return NULL;
-    };
+    }
 
     if (mraa_spi_bit_per_word(dev, 8) != MRAA_SUCCESS) {
         free(dev);
         return NULL;
-    };
+    }
 
     return dev;
 }
@@ -257,7 +257,8 @@ mraa_spi_write(mraa_spi_context dev, uint8_t data)
 }
 
 uint16_t
-mraa_spi_write_word(mraa_spi_context dev, uint16_t data) {
+mraa_spi_write_word(mraa_spi_context dev, uint16_t data)
+{
     struct spi_ioc_transfer msg;
     memset(&msg, 0, sizeof(msg));
 
@@ -297,7 +298,8 @@ mraa_spi_transfer_buf(mraa_spi_context dev, uint8_t* data, uint8_t* rxbuf, int l
 }
 
 mraa_result_t
-mraa_spi_transfer_buf_word(mraa_spi_context dev, uint16_t *data, uint16_t *rxbuf, int length) {
+mraa_spi_transfer_buf_word(mraa_spi_context dev, uint16_t* data, uint16_t* rxbuf, int length)
+{
     struct spi_ioc_transfer msg;
     memset(&msg, 0, sizeof(msg));
 
@@ -326,8 +328,9 @@ mraa_spi_write_buf(mraa_spi_context dev, uint8_t* data, int length)
     return recv;
 }
 
-uint16_t *
-mraa_spi_write_buf_word(mraa_spi_context dev, uint16_t *data, int length) {
+uint16_t*
+mraa_spi_write_buf_word(mraa_spi_context dev, uint16_t *data, int length)
+{
     uint16_t* recv = malloc(sizeof(uint16_t) * length);
 
     if (mraa_spi_transfer_buf_word(dev, data, recv, length) != MRAA_SUCCESS) {
@@ -337,8 +340,6 @@ mraa_spi_write_buf_word(mraa_spi_context dev, uint16_t *data, int length) {
     return recv;
 }
 
-
-
 mraa_result_t
 mraa_spi_stop(mraa_spi_context dev)
 {