Small fixes

Remove obsolete debugging line
Use variables instead of hardcoded directories