Added current conversion + code cleanup