Changes to fix the issue 3
Merged
Some style fixes