diff --git a/apps/statistics/histogram_parameter_controller.cpp b/apps/statistics/histogram_parameter_controller.cpp
index e8c277737..1ffc16f13 100644
--- a/apps/statistics/histogram_parameter_controller.cpp
+++ b/apps/statistics/histogram_parameter_controller.cpp
@@ -18,10 +18,6 @@ const char * HistogramParameterController::title() {
   return I18n::translate(I18n::Message::HistogramSet);
 }
 
-int HistogramParameterController::numberOfRows() {
-  return 1+k_numberOfCells;
-}
-
 void HistogramParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   if (index == numberOfRows()-1) {
     return;
@@ -34,10 +30,7 @@ void HistogramParameterController::willDisplayCellForIndex(HighlightCell * cell,
 
 double HistogramParameterController::parameterAtIndex(int index) {
   assert(index >= 0 && index < k_numberOfCells);
-  if (index == 0) {
-    return m_store->barWidth();
-  }
-  return m_store->firstDrawnBarAbscissa();
+  return index == 0 ? m_store->barWidth() : m_store->firstDrawnBarAbscissa();
 }
 
 bool HistogramParameterController::setParameterAtIndex(int parameterIndex, double f) {
@@ -109,10 +102,6 @@ HighlightCell * HistogramParameterController::reusableParameterCell(int index, i
   return m_cells[index];
 }
 
-int HistogramParameterController::reusableParameterCellCount(int type) {
-  return k_numberOfCells;
-}
-
 View * HistogramParameterController::loadView() {
   SelectableTableView * tableView = (SelectableTableView *)FloatParameterController::loadView();
   for (int i = 0; i < k_numberOfCells; i++) {
diff --git a/apps/statistics/histogram_parameter_controller.h b/apps/statistics/histogram_parameter_controller.h
index 3a9a35de2..ab20dd019 100644
--- a/apps/statistics/histogram_parameter_controller.h
+++ b/apps/statistics/histogram_parameter_controller.h
@@ -11,17 +11,17 @@ class HistogramParameterController : public Shared::FloatParameterController {
 public:
   HistogramParameterController(Responder * parentResponder, Store * store);
   const char * title() override;
-  int numberOfRows() override;
+  int numberOfRows() override { return 1+k_numberOfCells; }
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
+  constexpr static int k_numberOfCells = 2;
   HighlightCell * reusableParameterCell(int index, int type) override;
-  int reusableParameterCellCount(int type) override;
+  int reusableParameterCellCount(int type) override { return k_numberOfCells; }
   double parameterAtIndex(int index) override;
   bool setParameterAtIndex(int parameterIndex, double f) override;
   View * loadView() override;
   void unloadView(View * view) override;
   char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
-  constexpr static int k_numberOfCells = 2;
   MessageTableCellWithEditableText * m_cells[k_numberOfCells];
   Store * m_store;
 };