diff --git a/Bomber.cpp b/Bomber.cpp
index b937b627a08231aa4d9dcc596c0284afe1aec4b7..c168164059a9d4c0d44a3f7d6a08b5638030f7ff 100644
--- a/Bomber.cpp
+++ b/Bomber.cpp
@@ -118,7 +118,7 @@ static StaticPixelBuffer<23,11> constexpr left[2] = {
      }}}
     };
 
-const PixelBuffer& Bomber::getSprite()
+PixelBuffer const& Bomber::getSprite()
 {
     switch (dir) {
 
diff --git a/Enemy.cpp b/Enemy.cpp
index 2d1e500ac3ef94e931261947c007e7150f22105e..42f9e6e8bdad43ba08d7ba51c8dc872375a7c868 100644
--- a/Enemy.cpp
+++ b/Enemy.cpp
@@ -13,7 +13,7 @@ Enemy::Enemy(int health,float x, float y, enum direction dir, int animationstep)
 
 void Enemy::shoot(Level &level)
 {
-    const auto &sprite = this->getSprite();
+    auto const &sprite = this->getSprite();
     if(timetillreload<0)
     {
         switch ( this->dir ) {
diff --git a/Enemyprojectile.cpp b/Enemyprojectile.cpp
index 4d876b476ad2fbd6199ad02e3ed371b7cda498fb..b8c8989f38a66107274ad9af0d47d4acf4f5ac18 100644
--- a/Enemyprojectile.cpp
+++ b/Enemyprojectile.cpp
@@ -13,14 +13,14 @@ static StaticPixelBuffer<3,3> constexpr Psprite= {
         {"222"},
         {" 2 "}
     }}};
-const PixelBuffer& EnemyProjectile::getSprite()
+PixelBuffer const& EnemyProjectile::getSprite()
 {
     return Psprite;
 };
 bool EnemyProjectile::move(FloatSeconds const & Frametime, Level &level)
 {
     int speed = 15;
-    const auto &sprite = this->getSprite();
+    auto const &sprite = this->getSprite();
     switch (this->dir)
     {
         case direction::BACK: //down
@@ -97,7 +97,7 @@ bool EnemyProjectile::move(FloatSeconds const & Frametime, Level &level)
     return true;
 };
 
-bool EnemyProjectile::doStep(const FloatSeconds &Frametime, Level &level)
+bool EnemyProjectile::doStep(FloatSeconds const &Frametime, Level &level)
 {
     return move(Frametime,level);
 };
diff --git a/Level.cpp b/Level.cpp
index 04cf7c4586b63194905027692ccfe9621a1bb3ad..74232bbd5ddb3a889cbf375e9056da99aa0a0372 100644
--- a/Level.cpp
+++ b/Level.cpp
@@ -117,7 +117,7 @@ void Level::fillTrooperSpawner(float posX, float posY, unsigned int nmbrEnemies)
 
 // <hauerch71498 ----------------------------------------------------------------------
 /**Enemy Addprojectile**/
-void Level::addEnemyProjectile(const EnemyProjectile& projectile)
+void Level::addEnemyProjectile(EnemyProjectile const& projectile)
 {
     projectileVector.push_back(std::make_unique<EnemyProjectile>(projectile));
 };
@@ -125,7 +125,7 @@ void Level::addEnemyProjectile(const EnemyProjectile& projectile)
 
 // <weberma73121 ----------------------------------------------------------------------
 /**Player Addprojectile**/
-void Level::addPlayerProjectile(const PlayerProjectile& projectile)
+void Level::addPlayerProjectile(PlayerProjectile const& projectile)
 {
     projectileVector.push_back(std::make_unique<PlayerProjectile>(projectile));
 };
diff --git a/Level.hpp b/Level.hpp
index ce773657567d3ce10eb4008551f6990189b6f2a1..bd2666fa96fc888fe8f473f26bcb931977ed7915 100644
--- a/Level.hpp
+++ b/Level.hpp
@@ -121,8 +121,8 @@ class Level
 {
 public:
     Level(int width, int heigth, Player &player);
-    void addEnemyProjectile(const EnemyProjectile & projectile);
-    void addPlayerProjectile(const PlayerProjectile& projectile);
+    void addEnemyProjectile(EnemyProjectile const& projectile);
+    void addPlayerProjectile(PlayerProjectile const& projectile);
     void addWall(int length, int thickness, Position const &topleft, Orientation orientation);
     void addScenery(Position const &topleft, SceneryType type);
     void addEnemy(std::unique_ptr<Enemy> enemy_);
diff --git a/Scoreb.cpp b/Scoreb.cpp
index 3ee7eee84009fef94d54072e724a2345a695e86a..fb8df60b1862a22dd2908816dd7215a7bc6d7148 100644
--- a/Scoreb.cpp
+++ b/Scoreb.cpp
@@ -133,7 +133,7 @@ static StaticPixelBuffer<4,6> constexpr null= {
          {"AAA0"},
          {" 000"},
     }}};
-const PixelBuffer& Score::getGameOverSprite()
+PixelBuffer const& Score::getGameOverSprite()
 {
     return gameover;
 }
@@ -148,7 +148,7 @@ void Score::SetScoreSprite(int Score)
     }
 };
 
-const PixelBuffer& ScoreB::getScoreSprite()
+PixelBuffer const& ScoreB::getScoreSprite()
 {
     switch ( number ) {
 
diff --git a/Tank.cpp b/Tank.cpp
index e00098c1f5d426cbd1d7f7a6b483e9b0f91f5a7c..362553bc25cae4a6cc11fcf07b483f3564201afd 100644
--- a/Tank.cpp
+++ b/Tank.cpp
@@ -126,7 +126,7 @@ static StaticPixelBuffer<17,11> constexpr left[2] = {
          {" 101010101010101 "}
      }}}
     };
-const PixelBuffer& Tank::getSprite()
+PixelBuffer const& Tank::getSprite()
 {
     switch (dir) {
 
diff --git a/Trooper.cpp b/Trooper.cpp
index 1079b65627d2714f48565fdb0d440de02132aea2..299ed5b7fd9dd94ebe93fd03e343851ad356bf8e 100644
--- a/Trooper.cpp
+++ b/Trooper.cpp
@@ -109,7 +109,7 @@ static StaticPixelBuffer<5,9> constexpr right[2] = {
                                                {"1 11 "}
                                           }}}
                                           };
-const PixelBuffer& Trooper::getSprite()
+PixelBuffer const& Trooper::getSprite()
 {
     switch (dir) {
 
@@ -141,7 +141,7 @@ void Trooper::changeDirection()
 
 bool Trooper::checkmove(FloatSeconds const & Frametime, Level &level)
 {
-    const auto &sprite = this->getSprite();
+    auto const &sprite = this->getSprite();
     switch (this->dir)
     {
         case direction::BACK: //down
diff --git a/player.cpp b/player.cpp
index 7b4dd89e16522d7339b01b437a67ed9e29275316..e142ba6659f484c9eb7c8204e5d4291972bf00ee 100644
--- a/player.cpp
+++ b/player.cpp
@@ -302,7 +302,7 @@ static StaticPixelBuffer<39,7> constexpr lives[6]={
       }}}
 };
 
-const PixelBuffer& Player::getLivesSprite()
+PixelBuffer const& Player::getLivesSprite()
 {
     return lives[hitpoints];
 }