Some url bugs with senate data fixed. A few code refactoring done