Initial commit
Improve style