gui: code cleanup