Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Simon Binder <6e153e0b007d41886131fe1b3c497d3f384be07d@simonbinder.eu>
simolus3/moor,simolus3/moor,simolus3/drift,simolus3/moor,simolus3/moor,simolus3/drift,simolus3/drift,simolus3/drift,simolus3/drift,simolus3/moor,simolus3/drift,simolus3/moor,simolus3/drift,simolus3/moor