Removed file operations to have more elegant code and tests