refactoring
version 1 of clean-fabut
refactored  parametered reports to implicit ones, removed returns