Initial restyling
all testings passing
Merge pull request #42 from alpha-tango/styles

Styles