diff --git a/booking.studygroups.inc b/booking.studygroups.inc
index cf489e1..615bf91 100644
--- a/booking.studygroups.inc
+++ b/booking.studygroups.inc
@@ -244,14 +244,11 @@ function booking_available_leadhelp_select_form_submit($form, &$form_state) {
 		$found = FALSE;
 
 		//remove from being a leader?
-		if ($leader_session[$key] == "Remove")
-		{
+		if ($leader_session[$key] == "Remove") {
 			$num_deleted = db_delete('booking_studygroup_mapping')
 				->condition('booking_eventid', $event->eid)
 				->condition('booking_node_id', $key)
 				->condition('booking_studygroup_id', $booking_studygroup)
-			//	->condition('booking_session_id', $leader_session[$key])
-			//	->condition('booking_is_leader', 'Y')
 			 	->execute();
 			watchdog('booking', 'Removed person !nid from being a leader in study group !sid, affected !num rows.', 
 				array ('!nid' => $key, '!sid' => $booking_studygroup, '!num' => $num_deleted));	
@@ -260,14 +257,11 @@ function booking_available_leadhelp_select_form_submit($form, &$form_state) {
 			continue;
 		}
 		//remove from being a helper?
-		elseif ($helper_session[$key] == "Remove")
-		{
+		elseif ($helper_session[$key] == "Remove") {
 			$num_deleted = db_delete('booking_studygroup_mapping')
 				->condition('booking_eventid', $event->eid)
 				->condition('booking_node_id', $key)
 				->condition('booking_studygroup_id', $booking_studygroup)
-			//	->condition('booking_session_id', $helper_session[$key])
-			//	->condition('booking_is_helper', 'Y')
 			 	->execute();
 			watchdog('booking', 'Removed person !nid from being a helper in study group !sid, affected !num rows.', array ('!nid' => $key, '!sid' => $booking_studygroup, '!num' => $num_deleted));		
 			//skip to the next person
@@ -275,14 +269,11 @@ function booking_available_leadhelp_select_form_submit($form, &$form_state) {
 			continue;				
 		}
 		//remove from being a reserve leader?
-		elseif ($reserve_leader_session[$key] == "Remove")
-		{
+		elseif ($reserve_leader_session[$key] == "Remove") {
 			$num_deleted = db_delete('booking_studygroup_mapping')
 				->condition('booking_eventid', $event->eid)
 				->condition('booking_node_id', $key)
 				->condition('booking_studygroup_id', $booking_studygroup)
-			//	->condition('booking_session_id', $reserve_leader_session[$key])
-			//	->condition('booking_is_reserveleader', 'Y')
 			 	->execute();
 			watchdog('booking', 'Removed person !nid from being a reserve leader in study group !sid, affected !num rows.', 
 					array ('!nid' => $key, '!sid' => $booking_studygroup, '!num' => $num_deleted));		
@@ -327,8 +318,7 @@ function booking_available_leadhelp_select_form_submit($form, &$form_state) {
 				}
 		}
 		
-		if ($found == FALSE)
-		{
+		if ($found == FALSE) {
 			//run an insert
 			db_insert('booking_studygroup_mapping')
 				->fields(array(	
@@ -337,22 +327,15 @@ function booking_available_leadhelp_select_form_submit($form, &$form_state) {
 					'booking_studygroup_id' => $booking_studygroup,
 					'booking_session_id' => $session,
 					'booking_studygroup_role' => $role,
-					//'booking_is_leader' => $leader,
-					//'booking_is_helper' => $helper,	
-					//'booking_is_reserveleader' => $reserve_leader,
 			  ))
 			  ->execute();	
 		}
-		else
-		{
+		else {
 			//run an update
 			db_update('booking_studygroup_mapping')
 			->fields(array (
 				'booking_session_id' => $session,
 				'booking_studygroup_role' => $role,
-				//'booking_is_leader' => $leader,
-				//'booking_is_helper' => $helper,
-				//'booking_is_reserveleader' => $reserve_leader,
 				))
 			->condition('booking_node_id', $key)
 			->condition('booking_studygroup_id', $booking_studygroup)
@@ -1760,24 +1743,13 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
  */
 function booking_studygroups_process_colours() {
 	global $event;
-	
-	//get the id of the special study group that is actually the reading group
-	//$readinggroup_studygroup_id = variable_get('booking_readinggroup_id','7');
-	
-	//TODO: Query for all groups with the reading group flag set to Y, and loop through them all
 
-	//db select
-	//  join on booking_studygroup_list where booking_is_readinggroup = Y
+	//Query for all groups with the reading group flag set to Y, and loop through them all
 	$query = db_select('booking_studygroup_mapping', 'm');
 	$query->join('booking_studygroup_list', 's', 's.sid = m.booking_studygroup_id');
 	$query->condition('s.booking_is_readinggroup', 'Y', '=');
 	$query->fields('m')->fields('s', array('booking_studygroup_descrip'));
 	$group_mapping = $query->execute()->fetchAllAssoc('sid');			
-
-	//query for the mappings relating to $readinggroup_studygroup_id
-	//$group_mapping_query = db_query("SELECT * FROM {booking_studygroup_mapping} WHERE booking_eventid = :eid AND booking_studygroup_id = :sid",
-	//	 array(':eid' => $event->eid, ':sid' => $readinggroup_studygroup_id));
-	//$group_mapping = $group_mapping_query->fetchAll();	
 	
 	foreach ($group_mapping as $mapping)
 	{