--- a/javaextensions/location/orientation/inc/corientation.h	Fri Apr 30 10:40:48 2010 +0300
+++ b/javaextensions/location/orientation/inc/corientation.h	Tue May 11 16:07:20 2010 +0300
@@ -34,7 +34,7 @@
 {
 namespace location
 {
-
+// re arrange this header file to have more readable format
 class COrientation: public CBase, public MSensrvDataListener
 {
 public:
@@ -44,6 +44,9 @@
 
     // Channel Info
     TSensrvChannelInfo ichannelInfo;
+    
+    // Location Function Server
+    LocationFunctionServer* mFunctionServer;
 
 public:
     // Constructors and destructor
@@ -79,13 +82,9 @@
 
     /**
      * Opens the Channel and Starts the Data Listening
-     * @return Error number which indicates either sucess or failure
+     * @return 
      */
-    TInt GetOrientationL();
-
-public:
-    // Location Function Server
-    LocationFunctionServer* mFunctionServer;
+    void GetOrientationL();
 
 private:
     // new methods
@@ -93,7 +92,7 @@
     /**
      * Opens the the Channel
      */
-    TInt OpenChannel();
+    void OpenChannelL();
 
     /**
      * Creates the Channel Finder
@@ -108,13 +107,10 @@
     /**
      * Checks the hardware caliberation
      */
-    TInt CheckCalibration();
+    void CheckCalibrationL();
 
 private:
 
-    // JNI Environment Data
-    JNIEnv* mJni;
-    jobject mPeer;
     jclass iOrientationClass;
 
     // Azimuth Data Callback JNI Method ID