Cleanup code
Refactor scheme objects
Add missing file
Remove superfluous semicola in assembly