Cleanup

#### Resolves #6 #9 #12