Cleanup

Fixed pointer mangling, should now compile with -Wall -Werror -Wextra