Cleaner syntax

Tidy up repo; fix #15 and #16; fix travis tests failures;