Simplifying files and small fixes