Trying to reduce general file messiness