cleanup of imported scripts
style fixes