Cleaned up file path code

Change-Id: Ic682f746a5ae9c59b46a2349cdced15a9753f06d