Cleaned up the treasury room code.