code cleanup and comments
clergy and staff code cleanup and comments