Review Request 1692: Hardware: spring cleanup & refactor