v0.6.1

Code cleanup (NOT 100% finished)