Cleanup

Tried to clean things up quite a bit. Hoping to attack the tests a bit since they seem overwhelming right now.