file name cleanup, wrote down some future todos... like etags