some TODO cleanup and more working with Files