diff --git a/src/add-ons/translators/tga/TGAView.cpp b/src/add-ons/translators/tga/TGAView.cpp
index 24fd14c450..07794f1520 100644
--- a/src/add-ons/translators/tga/TGAView.cpp
+++ b/src/add-ons/translators/tga/TGAView.cpp
@@ -12,165 +12,96 @@
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
 // to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-// and/or sell copies of the Software, and to permit persons to whom the 
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
 // Software is furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included 
+// The above copyright notice and this permission notice shall be included
 // in all copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 /*****************************************************************************/
 
 #include <stdio.h>
 #include <string.h>
+
+
 #include "TGAView.h"
 #include "TGATranslator.h"
 
-// ---------------------------------------------------------------
-// Constructor
-//
-// Sets up the view settings
-//
-// Preconditions:
-//
-// Parameters:
-//
-// Postconditions:
-//
-// Returns:
-// ---------------------------------------------------------------
-TGAView::TGAView(const BRect &frame, const char *name,
-	uint32 resize, uint32 flags, TranslatorSettings *settings)
-	:	BView(frame, name, resize, flags)
+
+TGAView::TGAView(const BRect& frame, const char* name, uint32 resize,
+		uint32 flags, TranslatorSettings* settings)
+	:
+	BView(frame, name, resize, flags),
+	fSettings(settings)
 {
-	fSettings = settings;
-	
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	SetLowColor(ViewColor());
-	
-	BMessage *pmsg;
-	int32 val;
-	
-	pmsg = new BMessage(CHANGE_IGNORE_ALPHA);
+
 	fpchkIgnoreAlpha = new BCheckBox(BRect(10, 45, 180, 62),
-		"Ignore TGA alpha channel",
-		"Ignore TGA alpha channel", pmsg);
-	val = (fSettings->SetGetBool(TGA_SETTING_IGNORE_ALPHA)) ? 1 : 0;
+		"Ignore TGA alpha channel", "Ignore TGA alpha channel",
+		new BMessage(CHANGE_IGNORE_ALPHA));
+	int32 val = (fSettings->SetGetBool(TGA_SETTING_IGNORE_ALPHA)) ? 1 : 0;
 	fpchkIgnoreAlpha->SetValue(val);
 	fpchkIgnoreAlpha->SetViewColor(ViewColor());
 	AddChild(fpchkIgnoreAlpha);
-	
-	pmsg = new BMessage(CHANGE_RLE);
+
 	fpchkRLE = new BCheckBox(BRect(10, 67, 180, 84),
-		"Save with RLE Compression",
-		"Save with RLE Compression", pmsg);
+		"Save with RLE Compression", "Save with RLE Compression",
+		new BMessage(CHANGE_RLE));
 	val = (fSettings->SetGetBool(TGA_SETTING_RLE)) ? 1 : 0;
 	fpchkRLE->SetValue(val);
 	fpchkRLE->SetViewColor(ViewColor());
 	AddChild(fpchkRLE);
 }
 
-// ---------------------------------------------------------------
-// Destructor
-//
-// Releases the translator settings
-//
-// Preconditions:
-//
-// Parameters:
-//
-// Postconditions:
-//
-// Returns:
-// ---------------------------------------------------------------
+
 TGAView::~TGAView()
 {
 	fSettings->Release();
 }
 
-// ---------------------------------------------------------------
-// AllAttached
-//
-//
-//
-// Preconditions:
-//
-// Parameters:
-//
-// Postconditions:
-//
-// Returns:
-// ---------------------------------------------------------------
+
 void
 TGAView::AllAttached()
 {
-	BMessenger msgr(this);
-	fpchkIgnoreAlpha->SetTarget(msgr);
-	fpchkRLE->SetTarget(msgr);
+	fpchkIgnoreAlpha->SetTarget(this);
+	fpchkRLE->SetTarget(this);
 }
 
-// ---------------------------------------------------------------
-// MessageReceived
-//
-// Handles state changes of the RLE setting checkbox
-//
-// Preconditions:
-//
-// Parameters: message	the actual BMessage that was received
-//
-// Postconditions:
-//
-// Returns:
-// ---------------------------------------------------------------
+
 void
-TGAView::MessageReceived(BMessage *message)
+TGAView::MessageReceived(BMessage* message)
 {
-	bool bnewval;
 	switch (message->what) {
 		case CHANGE_IGNORE_ALPHA:
-			if (fpchkIgnoreAlpha->Value())
-				bnewval = true;
-			else
-				bnewval = false;
-			fSettings->SetGetBool(TGA_SETTING_IGNORE_ALPHA, &bnewval);
+		{
+			bool ignoreAlpha = fpchkIgnoreAlpha->Value() == B_CONTROL_ON;
+			fSettings->SetGetBool(TGA_SETTING_IGNORE_ALPHA, &ignoreAlpha);
 			fSettings->SaveSettings();
-			break;
-		
+		}	break;
+
 		case CHANGE_RLE:
-			if (fpchkRLE->Value())
-				bnewval = true;
-			else
-				bnewval = false;
-			fSettings->SetGetBool(TGA_SETTING_RLE, &bnewval);
+		{
+			bool saveWithRLE = fpchkRLE->Value() == B_CONTROL_ON;
+			fSettings->SetGetBool(TGA_SETTING_RLE, &saveWithRLE);
 			fSettings->SaveSettings();
-			break;
-		
+		}	break;
+
 		default:
 			BView::MessageReceived(message);
 			break;
 	}
 }
 
-// ---------------------------------------------------------------
-// Draw
-//
-// Draws information about the TGATranslator to this view.
-//
-// Preconditions:
-//
-// Parameters: area,	not used
-//
-// Postconditions:
-//
-// Returns:
-// ---------------------------------------------------------------
+
 void
 TGAView::Draw(BRect area)
 {
@@ -180,16 +111,15 @@ TGAView::Draw(BRect area)
 	float xbold, ybold;
 	xbold = fh.descent + 1;
 	ybold = fh.ascent + fh.descent * 2 + fh.leading;
-	
-	char title[] = "TGA Image Translator";
-	DrawString(title, BPoint(xbold, ybold));
-	
+
+	DrawString("TGA Image Translator", BPoint(xbold, ybold));
+
 	SetFont(be_plain_font);
 	font_height plainh;
 	GetFontHeight(&plainh);
 	float yplain;
 	yplain = plainh.ascent + plainh.descent * 2 + plainh.leading;
-	
+
 	char detail[100];
 	sprintf(detail, "Version %d.%d.%d %s",
 		static_cast<int>(B_TRANSLATION_MAJOR_VERSION(TGA_TRANSLATOR_VERSION)),
@@ -197,9 +127,7 @@ TGAView::Draw(BRect area)
 		static_cast<int>(B_TRANSLATION_REVISION_VERSION(TGA_TRANSLATOR_VERSION)),
 		__DATE__);
 	DrawString(detail, BPoint(xbold, yplain + ybold));
-/*	char copyright[] = "© 2002 Haiku Project";
-	DrawString(copyright, BPoint(xbold, yplain * 2 + ybold));
-*/	
-	char writtenby[] = "Written by the Haiku Translation Kit Team";
-	DrawString(writtenby, BPoint(xbold, yplain * 7 + ybold));
+
+	DrawString("Written by the Haiku Translation Kit Team",
+		BPoint(xbold, yplain * 7 + ybold));
 }