Added cancan and did some cleanup