Structural cleanups + removed some redundancy