Cleaning up

Preparing to redesign the synthesizer, but cleaned up several parts in the process.