Clean project

Resolves #15