consolidated controllers; cleaned up a bit