(cleanup) removed white space and console logs
(cleanup) Add consistency in aligned with style-guideline