File clean-up and slight change

Self-explanatory