Refine 1

Now we have a clean solution for reading files ;)