(file_path.h) Cleanups