Code cleanup, preparement for Pypi.