improve GUI & clean code