Feature/refactor code base for sonar #16

Closed ishaan-puniani closed 7 years ago