Cleanup of muon packages

Hi,

this MR does some cleanup in some muon packages, e.g. using std::abs/sqrt or removing commented lines.

Best, Nico