Merge "profcollectd: Refactor for better code clarity"