Use cleaner pin naming and interface