visual improvements
code improvements.
Merge pull request #4 from gneutzling/refactoring

Refactoring