cleanup, version 0.1.1

group globals, remove unneeded