Corrected path and small cleanup.