Some refactoring and reformatting on the C code

Signed-off-by: Erik Boasson <eb@ilities.com>