Code Quality (Fixed last commit)

2.  0% Duplicate Code