code style
improvements
Merge pull request #1 from alessioalex/master

backend && frontend improvements