initial commit after cleanups