Clneaup some whitespace, change how calloc called