Fixing singleton + cleanup

Closes #17