Reformat code and update readme