cleanup and pragma marks
refactored data generator
cleanup