First Round Updates

Readability, order, and removing register conflicts