Reformat layout, remove excess info, clean code