gtk code cleaning