making things ready for Oracle
refactoring
fiddling around