Cleaned the code up to change return types for the converter