WIP
Code style
Code style clean up
Pull common elemens of enry point into helper. Clean up pieces, so some renaming