Refactor Again.

Hopefully won't have to do again -_-