refactoring and minor edits
will recreate later
no longer needed