Clean up GUI Code