Minor improvements (reformat code)