Removed unused rel_path string (It compiles with the default -Werror now)
More formatting cleanups