Fixing code + style
Fixing style