GUI & Code cleanup