Sprint 3 : Bug fixing + Reduce code violations