Close #7
Some style #6