diff --git a/src/classicgame/classicnote.cpp b/src/classicgame/classicnote.cpp
index efb3beb..6305bb5 100644
--- a/src/classicgame/classicnote.cpp
+++ b/src/classicgame/classicnote.cpp
@@ -35,7 +35,9 @@ void ClassicNote::putToGame(const microsec &music_offset)
 
 bool ClassicNote::isInGame() const
 {
-    return _state == State::FLYING || _state == State::ACTIVE || _state == State::DYING;
+    return _state == State::FLYING
+        || _state == State::ACTIVE
+        || _state == State::DYING;
 }
 
 bool ClassicNote::isExpired() const
diff --git a/src/classicgame/classicnote.h b/src/classicgame/classicnote.h
index d87d0df..f1992e6 100644
--- a/src/classicgame/classicnote.h
+++ b/src/classicgame/classicnote.h
@@ -52,15 +52,24 @@ public:
     const Coordinates& getCoordinates() const noexcept;
 
 private:
-    const Coordinates _coordinates;
+
+    struct NoteElement
+    {
+        std::shared_ptr<ClassicSprite> _sprite;
+        std::array<std::shared_ptr<ClassicAnimationScenario>, 5> _animations;
+
+        const std::array<const sf::Keyboard::Key, 2> _keys;
+        const Coordinates _coordinates;
+        const Type _type;
+
+        bool pressed = false;
+        sf::Keyboard::Key pressed_as;
+    };
+
+    std::vector<NoteElement> _elements;
+
     const PrecisionEvaluator<Grade> _evaluator;
-    const std::array<const sf::Keyboard::Key, 2> _keys;
-
     const std::unique_ptr<ClassicGraphicsManager>& _graphics_manager;
-    std::shared_ptr<ClassicSprite> _sprite;
-
-    const Type _type;
 
     State _state;
-    std::array<std::shared_ptr<ClassicAnimationScenario>, 5> _animations;
 };