Cleaned up changes from rating switch