cleaned converter, modified variable names