Code changes after mechanic code inspection
Code changes after mechanic code inspection