cleaned comments and removed hardcoded path