refactored the creation scripts