Cleaned Up some Code to Interfaces