Updated wrong types for parameters
Updated wrong types for parameters and cleaned up imports