Changes as suggested in PR #6 review

Code cleaned up.
Demo now uses multiline statements.