pogoplug: refactoring