Simplify file further