Cleanup the code

[ofirgall]

Split some code to a utils.py file