This cleans up the interface a bit as well.
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>