MANT: Simplify code removing type specific loops