extensive code cleanup on rambles views