code reformat
code reformat + field alignment
Merge pull request #15 from n-ctrl/master

field alignment fixes and code reformat