working branch, multimodule
Code cleanup
cleanup, utility functions