Comments cleanup and removed hardcoded paths.