Update formatting and integrate previous solution changes#10

jaybarden1 merged 3 commits intomainastar-development/astar-dev-net10:mainfrom

features/bring-changes-over-againastar-development/astar-dev-net10:features/bring-changes-over-againCopy head branch name to clipboard