I saw that. But I would like to tackle one problem at a time especially given this is my first stab at the bosh_agent codebase. Though something we should add to the backlog as technical debt so that we can take time to address this problem.