Remove if condition & simplify repos method
Extract private method from repos