Code cleanup

[FDelporte]

I took the opportunity to do some cleanup in the code to remove the ( and ) from some returns, and simplify the priority methods.

[taartspi]

Thanks Frank. I have that old habit () to break.