Reformat code, more change. Release version 1.0