diff --git a/apps/shared/initialisation_parameter_controller.cpp b/apps/shared/initialisation_parameter_controller.cpp
index 1cd9c1ca6..9c7cbe4fe 100644
--- a/apps/shared/initialisation_parameter_controller.cpp
+++ b/apps/shared/initialisation_parameter_controller.cpp
@@ -4,30 +4,21 @@
 
 namespace Shared {
 
-InitialisationParameterController::InitialisationParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange) :
-  ViewController(parentResponder),
-  m_selectableTableView(this, this, this),
-  m_graphRange(graphRange)
-{
+View * InitialisationParameterController::view() {
+  return &m_selectableTableView;
 }
 
 const char * InitialisationParameterController::title() {
   return I18n::translate(I18n::Message::Initialization);
 }
 
-View * InitialisationParameterController::view() {
-  return &m_selectableTableView;
-}
-
-void InitialisationParameterController::didBecomeFirstResponder() {
-  m_selectableTableView.selectCellAtLocation(0, 0);
-  app()->setFirstResponder(&m_selectableTableView);
-}
-
 bool InitialisationParameterController::handleEvent(Ion::Events::Event event) {
 if (event == Ion::Events::OK || event == Ion::Events::EXE) {
-    RangeMethodPointer rangeMethods[k_totalNumberOfCells] = {&InteractiveCurveViewRange::setTrigonometric,
-    &InteractiveCurveViewRange::roundAbscissa, &InteractiveCurveViewRange::normalize, &InteractiveCurveViewRange::setDefault};
+    RangeMethodPointer rangeMethods[k_totalNumberOfCells] = {
+      &InteractiveCurveViewRange::setTrigonometric,
+      &InteractiveCurveViewRange::roundAbscissa,
+      &InteractiveCurveViewRange::normalize,
+      &InteractiveCurveViewRange::setDefault};
     (m_graphRange->*rangeMethods[selectedRow()])();
     StackViewController * stack = (StackViewController *)parentResponder();
     stack->pop();
@@ -36,10 +27,18 @@ if (event == Ion::Events::OK || event == Ion::Events::EXE) {
   return false;
 }
 
+void InitialisationParameterController::didBecomeFirstResponder() {
+  m_selectableTableView.selectCellAtLocation(0, 0);
+  app()->setFirstResponder(&m_selectableTableView);
+}
+
 int InitialisationParameterController::numberOfRows() {
   return k_totalNumberOfCells;
-};
+}
 
+KDCoordinate InitialisationParameterController::cellHeight() {
+  return Metric::ParameterCellHeight;
+}
 
 HighlightCell * InitialisationParameterController::reusableCell(int index) {
   assert(index >= 0);
@@ -51,14 +50,13 @@ int InitialisationParameterController::reusableCellCount() {
   return k_totalNumberOfCells;
 }
 
-KDCoordinate InitialisationParameterController::cellHeight() {
-  return Metric::ParameterCellHeight;
-}
-
 void InitialisationParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  MessageTableCell * myCell = (MessageTableCell *)cell;
-  I18n::Message titles[4] = {I18n::Message::Trigonometric, I18n::Message::RoundAbscissa, I18n::Message::Orthonormal, I18n::Message::DefaultSetting};
-  myCell->setMessage(titles[index]);
+  I18n::Message titles[4] = {
+    I18n::Message::Trigonometric,
+    I18n::Message::RoundAbscissa,
+    I18n::Message::Orthonormal,
+    I18n::Message::DefaultSetting};
+  ((MessageTableCell *)cell)->setMessage(titles[index]);
 }
 
 }
diff --git a/apps/shared/initialisation_parameter_controller.h b/apps/shared/initialisation_parameter_controller.h
index 46375df75..929040cfb 100644
--- a/apps/shared/initialisation_parameter_controller.h
+++ b/apps/shared/initialisation_parameter_controller.h
@@ -9,7 +9,11 @@ namespace Shared {
 
 class InitialisationParameterController : public ViewController, public SimpleListViewDataSource, public SelectableTableViewDataSource {
 public:
-  InitialisationParameterController(Responder * parentResponder, Shared::InteractiveCurveViewRange * graphRange);
+  InitialisationParameterController(Responder * parentResponder, Shared::InteractiveCurveViewRange * graphRange) :
+    ViewController(parentResponder),
+    m_selectableTableView(this, this, this),
+    m_graphRange(graphRange)
+  {}
   View * view() override;
   const char * title() override;
   bool handleEvent(Ion::Events::Event event) override;