Fixed Review comments from Moodlerooms.