Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 7598)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 7599)
@@ -21,5 +21,6 @@
 import grok
 from datetime import date, datetime
-import grokcore.view
+from grokcore.view import PageTemplateFile
+from grokcore.formlib.formlib import Action
 from cgi import escape
 from zope.i18nmessageid import Message
@@ -29,5 +30,4 @@
 from zope.component import getUtility, queryUtility, ComponentLookupError
 from zope.formlib.utility import setUpWidgets
-from grokcore.formlib.formlib import Action
 from zope.interface import Interface
 from zope.site.hooks import getSite
@@ -40,13 +40,13 @@
 
 grok.templatedir('templates')
-default_waeup_display_template = grokcore.view.PageTemplateFile(
+default_waeup_display_template = PageTemplateFile(
     os.path.join('templates', 'default_waeup_display_form.pt'))
 default_waeup_display_template.__grok_name__ = 'default_waeup_display_form'
 
-default_waeup_edit_template = grokcore.view.PageTemplateFile(
+default_waeup_edit_template = PageTemplateFile(
     os.path.join('templates', 'default_waeup_edit_form.pt'))
 default_waeup_edit_template.__grok_name__ = 'default_waeup_edit_form'
 
-default_primary_nav_template = grokcore.view.PageTemplateFile(
+default_primary_nav_template = PageTemplateFile(
     os.path.join('templates', 'primarynavtab.pt'))
 default_primary_nav_template.__grok_name__ = 'default_primary_nav'
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/accommodation.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/accommodation.py	(revision 7598)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/accommodation.py	(revision 7599)
@@ -17,5 +17,5 @@
 ##
 """
-Container which contains the (student) accommodation objects.
+Student accommodation components.
 """
 from datetime import datetime
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/payments.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/payments.py	(revision 7598)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/payments.py	(revision 7599)
@@ -17,5 +17,5 @@
 ##
 """
-Container which contains the (student) payment objects.
+Student payment components.
 """
 import grok
Index: /main/waeup.sirp/trunk/src/waeup/sirp/widgets/datewidget.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/widgets/datewidget.py	(revision 7598)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/widgets/datewidget.py	(revision 7599)
@@ -118,5 +118,5 @@
     This widget is suitable for edit and add forms.
     
-    Valid `format` values are the keys of :var:`DATE_FORMATS`
+    Valid `format` values are the keys of `DATE_FORMATS`
     dict. Default is ``le`` (little endian; DD/MM/YYYY).
 
@@ -135,5 +135,5 @@
     This widget is suitable for display forms.
     
-    Valid `format` values are the keys of :var:`DATE_FORMATS`
+    Valid `format` values are the keys of `DATE_FORMATS`
     dict. Default is ``le`` (little endian; DD/MM/YYYY).
 
@@ -152,5 +152,5 @@
     This widget is suitable for display forms.
 
-    Valid `format` values are the keys of :var:`DATE_FORMATS`
+    Valid `format` values are the keys of `DATE_FORMATS`
     dict. Default is ``le`` (little endian; DD/MM/YYYY %H:%M:%S).
 
