I just use an eclipse addon to reformat as needed.