code cleanup, return interface instead of implementation
Authored by: mrieser 2009-07-28
Parent: [r8124]
Child: [r8126]
