remove globals, clean up structure a bit
s/init/create, some cleanup remove x-strings