Cleaned up and unified tuner types and methods