Organazing some code.
...