chore: converting functions to expression bodies and minor function refactoring

[casplattel]

Converting some functions to expression bodies while boyscouting the code, also found a minor refactoring.