Refactoring

Just cleaning a few things up before we add the reputation / voting systems.