Sonar Issues Fixed:
 * Major:
 	- Avoid Duplicate Literals
 	- Ncss Method Count