(Ross) Cleaned up .c files and updated demo script