Minor coding style tweaks; removed dirname( __FILE__ ) in favor of __DIR__

Change-Id: Ibf08c4ea14394fed3b75e3c661cbc22693c608bf