Reformat code and change style