Code cleanup, remove logging, split FileSource implementation.