reformat code and stuff