Full code reformat with IDEA