Fixed build failure via 'make' due to wrong relative path; code cleanup.